modelmenuitem: Set label on menu items

We have to add a check for GTK_IS_ACCEL_LABEL too now...

diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 8eac6d5f460b4cb9f10d4b41b69efc4a3434d7d4..520c2a59670cb9fe5ed6af523be5c6f06ee19e78 100644 (file)
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -995,7 +995,7 @@ gtk_accel_label_set_label (GtkAccelLabel *accel_label,
 
   g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
 
-  gtk_label_set_label (GTK_LABEL (priv->text_label), text);
+  gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->text_label), text);
 }
 
 const char *

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 1dfdef0d4a4290b263b20dcb2fc0a279f5e1416e..5680bc8a0331f1b3809792c87e0a9835c9f18d3c 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1923,6 +1923,9 @@ gtk_menu_item_get_use_underline (GtkMenuItem *menu_item)
   child = gtk_bin_get_child (GTK_BIN (menu_item));
   if (GTK_IS_LABEL (child))
     return gtk_label_get_use_underline (GTK_LABEL (child));
+  else if (GTK_IS_ACCEL_LABEL (child))
+    return gtk_accel_label_get_use_underline (GTK_ACCEL_LABEL (child));
+
 
   return FALSE;
 }

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index f49bb4438b1e2e5c6763f4facbd6cb2d609c632d..c99c470bea587367c47da95d3b80d30fd3b2123f 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1813,8 +1813,6 @@ gtk_menu_shell_tracker_insert_func (GtkMenuTrackerItem *item,
       label = gtk_menu_tracker_item_get_label (item);
       if (label)
         gtk_menu_item_set_label (GTK_MENU_ITEM (widget), label);
-
-      gtk_widget_show (widget);
     }
   else if (gtk_menu_tracker_item_get_has_link (item, G_MENU_LINK_SUBMENU))
     {
@@ -1852,8 +1850,6 @@ gtk_menu_shell_tracker_insert_func (GtkMenuTrackerItem *item,
           g_signal_connect (submenu, "hide", G_CALLBACK (gtk_menu_shell_submenu_hidden), item);
           g_signal_connect (submenu, "selection-done", G_CALLBACK (gtk_menu_shell_submenu_selection_done), item);
         }
-
-      gtk_widget_show (widget);
     }
   else
     {

diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c
index 0083452edf68a4a53a22235abb77b876ce1d4016..1d4a5d40dc1d98734d7b8f0e4a50ed929fbd7685 100644 (file)
--- a/gtk/gtkmodelmenuitem.c
+++ b/gtk/gtkmodelmenuitem.c
@@ -252,6 +252,11 @@ gtk_model_menu_item_set_text (GtkModelMenuItem *item,
       gtk_label_set_text_with_mnemonic (GTK_LABEL (child), text);
       return;
     }
+  else if (GTK_IS_ACCEL_LABEL (child))
+    {
+      gtk_accel_label_set_label (GTK_ACCEL_LABEL (child), text);
+      return;
+    }
 
   if (!GTK_IS_CONTAINER (child))
     return;